Updated to fix issue#1 #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Squashed commit of the following: commit 5c54cc1 Merge: affdc24 1132f48 Author: Daryl Hedley <[email protected]> Date: Wed Dec 11 16:44:06 2013 +0000 Merge branch 'develop' of https://github.com/adaptlearning/adapt-contrib-media into feature/8830 * 'develop' of https://github.com/adaptlearning/adapt-contrib-media: Updated media component with fixes to issue#1 Conflicts: js/adapt-contrib-media.js commit affdc24 Author: Chris Steele <[email protected]> Date: Wed Dec 11 15:23:20 2013 +0000 issues 1 commit 201f034 Author: Chris Steele <[email protected]> Date: Wed Dec 11 14:08:46 2013 +0000 clean up commit 4899190 Author: Chris Steele <[email protected]> Date: Wed Dec 11 13:46:52 2013 +0000 various updates and restructure commit 831cbff Author: Chris Steele <[email protected]> Date: Wed Dec 11 11:49:36 2013 +0000 test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Squashed commit of the following:
commit 5c54cc1
Merge: affdc24 1132f48
Author: Daryl Hedley [email protected]
Date: Wed Dec 11 16:44:06 2013 +0000
commit affdc24
Author: Chris Steele [email protected]
Date: Wed Dec 11 15:23:20 2013 +0000
commit 201f034
Author: Chris Steele [email protected]
Date: Wed Dec 11 14:08:46 2013 +0000
commit 4899190
Author: Chris Steele [email protected]
Date: Wed Dec 11 13:46:52 2013 +0000
commit 831cbff
Author: Chris Steele [email protected]
Date: Wed Dec 11 11:49:36 2013 +0000